From 58eb7f8d5b38c08c41ef5c40517b99778ce423eb Mon Sep 17 00:00:00 2001 From: "djm@sportsman.spdomain" Date: Fri, 1 Apr 2005 20:56:01 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.196 (424db561VR_6nEc21FjFYEo8bC8SkQ) ia64: catch up with latest -unstable --- xen/arch/ia64/Makefile | 2 +- xen/include/asm-ia64/config.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile index b826c83b8b..a6becc9ac5 100644 --- a/xen/arch/ia64/Makefile +++ b/xen/arch/ia64/Makefile @@ -6,7 +6,7 @@ OBJS = xensetup.o setup.o time.o irq.o ia64_ksyms.o process.o smp.o \ xenmisc.o pdb-stub.o acpi.o hypercall.o \ machvec.o dom0_ops.o domain.o \ idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \ - sal.o cmdline.o mm_init.o tlb.o \ + sal.o cmdline.o mm_init.o tlb.o smpboot.o \ extable.o linuxextable.o \ regionreg.o entry.o unaligned.o privop.o vcpu.o \ irq_ia64.o irq_lsapic.o hpsim_irq.o vhpt.o xenasm.o dom_fw.o diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 2879cf5829..473d3f2c66 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -217,6 +217,10 @@ void sort_main_extable(void); #define ARCH_HAS_EXEC_DOMAIN_MM_PTR // see arch/x86/nmi.c !?!? + +// these declarations got moved at some point, find a better place for them +extern int opt_noht; +extern int ht_per_core; extern unsigned int watchdog_on; // xen/include/asm/config.h -- 2.30.2